Set the usize on the tearoff window so when we reparent the window out,

Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the
	tearoff window so when we reparent the window out,
	the window doesn't shrink down.

diff --git a/ChangeLog b/ChangeLog
index 42ef2c484aabdcecfb739b8eb54e56d6e3f30b96..20468eb62d7d6363363056c6e8443223c14f8b6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the
+       tearoff window so when we reparent the window out,
+       the window doesn't shrink down.
+
 1998-12-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: do not export the glib flags for thread support to

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 42ef2c484aabdcecfb739b8eb54e56d6e3f30b96..20468eb62d7d6363363056c6e8443223c14f8b6c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the
+       tearoff window so when we reparent the window out,
+       the window doesn't shrink down.
+
 1998-12-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: do not export the glib flags for thread support to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 42ef2c484aabdcecfb739b8eb54e56d6e3f30b96..20468eb62d7d6363363056c6e8443223c14f8b6c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the
+       tearoff window so when we reparent the window out,
+       the window doesn't shrink down.
+
 1998-12-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: do not export the glib flags for thread support to

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 42ef2c484aabdcecfb739b8eb54e56d6e3f30b96..20468eb62d7d6363363056c6e8443223c14f8b6c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the
+       tearoff window so when we reparent the window out,
+       the window doesn't shrink down.
+
 1998-12-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: do not export the glib flags for thread support to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 42ef2c484aabdcecfb739b8eb54e56d6e3f30b96..20468eb62d7d6363363056c6e8443223c14f8b6c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the
+       tearoff window so when we reparent the window out,
+       the window doesn't shrink down.
+
 1998-12-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: do not export the glib flags for thread support to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 42ef2c484aabdcecfb739b8eb54e56d6e3f30b96..20468eb62d7d6363363056c6e8443223c14f8b6c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the
+       tearoff window so when we reparent the window out,
+       the window doesn't shrink down.
+
 1998-12-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: do not export the glib flags for thread support to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 42ef2c484aabdcecfb739b8eb54e56d6e3f30b96..20468eb62d7d6363363056c6e8443223c14f8b6c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Dec 18 14:17:14 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Set the usize on the
+       tearoff window so when we reparent the window out,
+       the window doesn't shrink down.
+
 1998-12-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: do not export the glib flags for thread support to

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 72932b17c8a6e0c1bc56a5182e5d42ccc8737740..6008da04e6913673505a981ba23fb3ec0b512cdd 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -376,7 +376,11 @@ gtk_menu_popup (GtkMenu                *menu,
                       widget->window,
                       0, 0, 0, 0, -1, -1);
       gdk_gc_unref(gc);
-      
+
+      gtk_widget_set_usize (menu->tearoff_window,
+                           widget->requisition.width,
+                           widget->requisition.height);
+                   
       gdk_window_set_back_pixmap (menu->tearoff_window->window, pixmap, FALSE);
       gdk_pixmap_unref (pixmap);
 
@@ -599,6 +603,7 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
              GtkWidget *attach_widget;
              
              menu->tearoff_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+             gtk_widget_set_app_paintable (menu->tearoff_window, TRUE);
              gtk_signal_connect_object (GTK_OBJECT (menu->tearoff_window),  
                                         "key_press_event",
                                         GTK_SIGNAL_FUNC (gtk_menu_key_press),